Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sat, 3 Jul 2010 11:08:43 +0000 (11:08 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sat, 3 Jul 2010 11:08:43 +0000 (11:08 +0000)
commit16106cdc20f5ab0df22841e88bf9d6575bc8c6f7
tree88c79d33f767fbba3d2a1fcca5a5fa80fbadfd88
parent286e31852006966e5dac272ab8fbe286542c887f
parent7dcaf44f72f213632438cebbf5270288905b1331
Merge from mainline.